diff --git a/app/views/collections/_form.html.erb b/app/views/collections/_form.html.erb
new file mode 100644
index 0000000..1700453
--- /dev/null
+++ b/app/views/collections/_form.html.erb
@@ -0,0 +1,6 @@
+<%= form.label :title, :Title, {:class => 'big'} %><br />
+<%= form.text_field :title, {:class => 'big'} %><br />
+
+<%= form.label :description %><br />
+<%= form.text_area :description %><br />
+<br />
\ No newline at end of file
diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb
new file mode 100644
index 0000000..59f1d30
--- /dev/null
+++ b/app/views/collections/edit.html.erb
@@ -0,0 +1,12 @@
+<h1>Edit collection</h1>
+ 
+<% form_for @collection do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => "form", :object => f %>
+  <%= f.submit "Update" %>
+<% end %>
+
+<br /><%= link_to("Delete collection", { :action => "destroy", :id => @collection },
+  :confirm => "Are you sure you want to delete this collection?",
+  :method => :delete) %>
+<br /><%= link_to "All collections", collections_path %>
\ No newline at end of file
diff --git a/app/views/collections/new.html.erb b/app/views/collections/new.html.erb
new file mode 100644
index 0000000..46fa177
--- /dev/null
+++ b/app/views/collections/new.html.erb
@@ -0,0 +1,9 @@
+<h1>New collection</h1>
+ 
+<% form_for @collection do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => "form", :object => f %>
+  <%= f.submit "Create" %>
+<% end %>
+ 
+<br /><%= link_to "All collections", collections_path %>
\ No newline at end of file
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 58b4055..b4585a7 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -1 +1,6 @@
+<h1><%= h @collection.title %></h1>
+<p><%= h @collection.description %></p>
 <%= render :partial => @collection.albums %>
+
+<br /><%= link_to "Update collection", edit_collection_path(@collection) %>
+<br /><%= link_to "All collections", collections_path %>
\ No newline at end of file
diff --git a/app/views/photos/show.html.erb b/app/views/photos/show.html.erb
index 797820f..0c59af3 100644
--- a/app/views/photos/show.html.erb
+++ b/app/views/photos/show.html.erb
@@ -4,6 +4,9 @@
 <br/>
 Tagged with: <%= @photo.tag_list %>
 <p><%= @photo.description %></p>
+<% if @current_user.role.access_to("photo_note") %>
+<p><%= @photo.note %></p>
+<% end %>
 <br /><%= link_to "Update photo details", edit_photo_path(@photo) %>
 <br /><%= link_to "Back to #{@photo.album.title}", @photo.album %>
 <br /><%= link_to "All albums", albums_path %>
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index e09cec9..086e80d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -9,4 +9,9 @@ production:
     username: photogallery
     password: changeme
     database: gallery_production
-    socket: /var/run/mysqld/mysqld.sock
\ No newline at end of file
+    socket: /var/run/mysqld/mysqld.sock
+test:
+    adapter: postgresql
+    database: gallery_test
+    username: gallery
+    password: changeme
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d6f80a4..48d4d85 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -25,4 +25,9 @@ config.action_mailer.delivery_method = :test
 # Use SQL instead of Active Record's schema dumper when creating the test database.
 # This is necessary if your schema can't be completely dumped by the schema dumper,
 # like if you have constraints or database-specific column types
-# config.active_record.schema_format = :sql
\ No newline at end of file
+# config.active_record.schema_format = :sql
+
+config.gem "rspec"
+config.gem "rspec-rails"
+config.gem "webrat"
+config.gem "cucumber"
\ No newline at end of file