Buy views
Tests fixed